Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Nov 2011 19:31:04 +0000 (11:31 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Nov 2011 19:31:04 +0000 (11:31 -0800)
commite1d9788f3aee4c4fe5969327822972f09211417a
tree76d88c4e1ad48a466a008363b23b4ca4646a8817
parentece6dc347dc7e37fb1c74227b1eda232f92bb07f
parent72ba1c77e26eb51d2330d43979e877b45ab8e8f0
Merge from trunk.